bitkeeper revision 1.1159.187.23 (41a89e22M2fDCeiojlBqp-8YIh3N9w)

Small vm86 fix. vm86 mode still crashes Linux.

diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
index a3189508d51a5a2f008e2b71733e4956f7291694..f19fd7a473a1216b0f4d6cc836c3ed0519712a93 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
@@ -319,8 +319,9 @@ restore_all:
        RESTORE_ALL
 
 resume_vm86:
+       XEN_UNBLOCK_EVENTS(%esi)
        RESTORE_REGS
-       pushl %eax,(%esp)
+       movl %eax,(%esp)
        movl $__HYPERVISOR_switch_vm86,%eax
        int $0x82                       # Atomically enables events delivery
        ud2